From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Mon, 21 May 2012 16:44:21 +0000 (+0200)
Subject: Modal stack: fix handling of destroyed actors
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~6299
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f5e58c500fc0e67f68e8c71e9750c00f51d63fac;p=gnome-shell.git

Modal stack: fix handling of destroyed actors

Destroyed modal actors should be completely removed from the modal
stack automatically, including leaving modality if needed.
This allows for destroying modal dialogs without calling close().

https://bugzilla.gnome.org/show_bug.cgi?id=619955
---

diff --git a/js/ui/main.js b/js/ui/main.js
index 501af0441..0b12d7577 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -683,7 +683,7 @@ function pushModal(actor, timestamp, options) {
     let actorDestroyId = actor.connect('destroy', function() {
         let index = _findModal(actor);
         if (index >= 0)
-            modalActorFocusStack.splice(index, 1);
+            popModal(actor);
     });
     let curFocus = global.stage.get_key_focus();
     let curFocusDestroyId;